From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 19 Aug 2010 09:37:40 +0000 (+0200)
Subject: * lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6909
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e6e1168f0922300aed151b5fed6fdfabc9ae76bc;p=emacs.git

* lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 165938dc474..1793ae7fb8e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* simple.el (blink-matching-open): Obey forward-sexp-function.
+
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (prog-mode-map): New var.
diff --git a/lisp/simple.el b/lisp/simple.el
index 7c941fd63b9..b998eef88a0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5495,7 +5495,9 @@ it skips the contents of comments that end before point."
                        (and parse-sexp-ignore-comments
                             (not blink-matching-paren-dont-ignore-comments))))
                   (condition-case ()
-                      (scan-sexps oldpos -1)
+                      (progn
+                        (forward-sexp -1)
+                        (point))
                     (error nil))))))
 	   (matching-paren
             (and blinkpos